Multiple changes to reduce the amount of unprefixed symbols

The X11 backend exports a number of symbols which are _-prefixed
(so don't become part of the gdk api), but are not named in a
way to prevent accidental clashes between backends.

The one API change here is that the gdk_xid_table functions
have been removed - they did not server an purpose, since the
xid table only stores windows anyway, and we already have a
lookup-by-xid function for windows.

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index dc5db53d30a540bbd6bb99d2aa3f809d81abb0f7..b5aa4234bc6babd9ad9e39fec68e443f58bc3436 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -951,8 +951,6 @@ GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
 gdkx_visual_get
 gdk_x11_window_foreign_new_for_display
-gdk_xid_table_lookup
-gdk_xid_table_lookup_for_display
 gdk_x11_window_lookup_for_display
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 9e2446948f97ca6e1684e89a22ca0373c6e78aef..3e01953bf5f1386cfdc06a5cce621262c8c8578a 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -283,8 +283,6 @@ void gdk_synthesize_window_state (GdkWindow     *window,
                                   GdkWindowState unset_flags,
                                   GdkWindowState set_flags);
 
-GdkDeviceManager * _gdk_device_manager_new (GdkDisplay *display);
-
 gboolean _gdk_cairo_surface_extents (cairo_surface_t *surface,
                                      GdkRectangle *extents);
 

diff --git a/gdk/x11/gdkdevice-xi.h b/gdk/x11/gdkdevice-xi.h
index 36fab899506c9dbd526781b2fb24556071e30b1a..e0eb08dbfd5de6822dc6047951cc2e0ba464a715 100644 (file)
--- a/gdk/x11/gdkdevice-xi.h
+++ b/gdk/x11/gdkdevice-xi.h
@@ -66,23 +66,23 @@ struct _GdkDeviceXIClass
 };
 
 G_GNUC_INTERNAL
-GType gdk_device_xi_get_type (void) G_GNUC_CONST;
+GType gdk_device_xi_get_type           (void) G_GNUC_CONST;
 
 G_GNUC_INTERNAL
-void     gdk_device_xi_update_window_info (GdkWindow *window);
+void  gdk_device_xi_update_window_info (GdkWindow *window);
 
 G_GNUC_INTERNAL
-void     gdk_device_xi_update_axes (GdkDevice *device,
-                                    gint       axes_count,
-                                    gint       first_axis,
-                                    gint      *axis_data);
+void  gdk_device_xi_update_axes        (GdkDevice *device,
+                                        gint       axes_count,
+                                        gint       first_axis,
+                                        gint      *axis_data);
 G_GNUC_INTERNAL
-void     gdk_device_xi_translate_axes     (GdkDevice *device,
-                                           GdkWindow *window,
-                                           gint      *axis_data,
-                                           gdouble   *axes,
-                                           gdouble   *x,
-                                           gdouble   *y);
+void  gdk_device_xi_translate_axes     (GdkDevice *device,
+                                        GdkWindow *window,
+                                        gint      *axis_data,
+                                        gdouble   *axes,
+                                        gdouble   *x,
+                                        gdouble   *y);
 
 G_END_DECLS
 

diff --git a/gdk/x11/gdkdevice-xi2.h b/gdk/x11/gdkdevice-xi2.h
index f30ebb79e628ea0bbcd614f60d4616df0a03b6dd..63aaf252ef5499bf0a3a18bb590a5e1cc0442b24 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.h
+++ b/gdk/x11/gdkdevice-xi2.h
@@ -51,11 +51,11 @@ struct _GdkDeviceXI2Class
 };
 
 G_GNUC_INTERNAL
-GType gdk_device_xi2_get_type (void) G_GNUC_CONST;
+GType    gdk_device_xi2_get_type             (void) G_GNUC_CONST;
 
 G_GNUC_INTERNAL
-guchar * gdk_device_xi2_translate_event_mask (GdkEventMask  event_mask,
-                                              int          *len);
+guchar * gdk_device_xi2_translate_event_mask (GdkEventMask     event_mask,
+                                              int             *len);
 G_GNUC_INTERNAL
 guint    gdk_device_xi2_translate_state      (XIModifierState *mods_state,
                                               XIButtonState   *buttons_state);

diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index 4a6953d3befce1a0176c163ccd4119e431abf88f..cecc82f33ba71069bf9b8b8872857250d5a911bd 100644 (file)
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -29,7 +29,7 @@
 #include "gdkx.h"
 
 GdkDeviceManager *
-_gdk_device_manager_new (GdkDisplay *display)
+_gdk_x11_device_manager_new (GdkDisplay *display)
 {
   if (!g_getenv ("GDK_CORE_DEVICE_EVENTS"))
     {

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index b61d8327a952a069566f97c4d470e44114250a38..a3fefb992d3f778df72fb29a297871dfdcf23fc8 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1255,12 +1255,12 @@ _gdk_x11_display_open (const gchar *display_name)
    * structures in places
    */
   for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
-    _gdk_screen_x11_events_init (display_x11->screens[i]);
+    _gdk_x11_screen_init_events (display_x11->screens[i]);
 
   /*set the default screen */
   display_x11->default_screen = display_x11->screens[DefaultScreen (display_x11->xdisplay)];
 
-  display->device_manager = _gdk_device_manager_new (display);
+  display->device_manager = _gdk_x11_device_manager_new (display);
 
   gdk_event_init (display);
 

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 534f5de451b6e36973cfc6683a8d166264e50677..b321f3224ceb9713c179155b66c0da6800070797 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -605,11 +605,11 @@ is_pointer_within_shape (GdkDisplay    *display,
       GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
       cairo_region_t *input_shape;
 
-      child->shape = _xwindow_get_shape (display_x11->xdisplay,
-                                         child->xid, ShapeBounding);
+      child->shape = _gdk_x11_xwindow_get_shape (display_x11->xdisplay,
+                                                 child->xid, ShapeBounding);
 #ifdef ShapeInput
-      input_shape = _xwindow_get_shape (display_x11->xdisplay,
-                                        child->xid, ShapeInput);
+      input_shape = _gdk_x11_xwindow_get_shape (display_x11->xdisplay,
+                                                child->xid, ShapeInput);
       if (child->shape && input_shape)
         {
           cairo_region_intersect (child->shape, input_shape);

diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index b252e0324eea8847609a8b9f98416804aebc2434..bd05031f02a1ab5d1e62759031890016d649c6b0 100644 (file)
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -202,9 +202,9 @@ gdk_event_source_translate_event (GdkEventSource *event_source,
       GdkEventTranslator *translator = list->data;
 
       list = list->next;
-      event = gdk_event_translator_translate (translator,
-                                              event_source->display,
-                                              xevent);
+      event = _gdk_x11_event_translator_translate (translator,
+                                                   event_source->display,
+                                                   xevent);
     }
 
   if (event &&
@@ -394,12 +394,12 @@ gdk_x11_event_source_select_events (GdkEventSource *source,
       GdkEventTranslator *translator = list->data;
       GdkEventMask translator_mask, mask;
 
-      translator_mask = gdk_event_translator_get_handled_events (translator);
+      translator_mask = _gdk_x11_event_translator_get_handled_events (translator);
       mask = event_mask & translator_mask;
 
       if (mask != 0)
         {
-          gdk_event_translator_select_window_events (translator, window, mask);
+          _gdk_x11_event_translator_select_window_events (translator, window, mask);
           event_mask &= ~mask;
         }
 

diff --git a/gdk/x11/gdkeventtranslator.c b/gdk/x11/gdkeventtranslator.c
index b4a285a962eba284b8365b5946046836d21b80b1..bbd79dcae2b276e0aaa4e9b70375d06c57b50fa1 100644 (file)
--- a/gdk/x11/gdkeventtranslator.c
+++ b/gdk/x11/gdkeventtranslator.c
@@ -23,19 +23,19 @@
 
 
 typedef GdkEventTranslatorIface GdkEventTranslatorInterface;
-G_DEFINE_INTERFACE (GdkEventTranslator, gdk_event_translator, G_TYPE_OBJECT);
+G_DEFINE_INTERFACE (GdkEventTranslator, _gdk_x11_event_translator, G_TYPE_OBJECT);
 
 
 static void
-gdk_event_translator_default_init (GdkEventTranslatorInterface *iface)
+_gdk_x11_event_translator_default_init (GdkEventTranslatorInterface *iface)
 {
 }
 
 
 GdkEvent *
-gdk_event_translator_translate (GdkEventTranslator *translator,
-                                GdkDisplay         *display,
-                                XEvent             *xevent)
+_gdk_x11_event_translator_translate (GdkEventTranslator *translator,
+                                     GdkDisplay         *display,
+                                     XEvent             *xevent)
 {
   GdkEventTranslatorIface *iface;
   GdkEvent *event;
@@ -59,7 +59,7 @@ gdk_event_translator_translate (GdkEventTranslator *translator,
 }
 
 GdkEventMask
-gdk_event_translator_get_handled_events (GdkEventTranslator *translator)
+_gdk_x11_event_translator_get_handled_events (GdkEventTranslator *translator)
 {
   GdkEventTranslatorIface *iface;
 
@@ -74,9 +74,9 @@ gdk_event_translator_get_handled_events (GdkEventTranslator *translator)
 }
 
 void
-gdk_event_translator_select_window_events (GdkEventTranslator *translator,
-                                           Window              window,
-                                           GdkEventMask        event_mask)
+_gdk_x11_event_translator_select_window_events (GdkEventTranslator *translator,
+                                                Window              window,
+                                                GdkEventMask        event_mask)
 {
   GdkEventTranslatorIface *iface;
 

diff --git a/gdk/x11/gdkeventtranslator.h b/gdk/x11/gdkeventtranslator.h
index 62c99e3f5d9bc976ff17972422f7d13a747231c7..b93a8c809304706ae9d35028b3bea4602b87a02b 100644 (file)
--- a/gdk/x11/gdkeventtranslator.h
+++ b/gdk/x11/gdkeventtranslator.h
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define GDK_TYPE_EVENT_TRANSLATOR         (gdk_event_translator_get_type ())
+#define GDK_TYPE_EVENT_TRANSLATOR         (_gdk_x11_event_translator_get_type ())
 #define GDK_EVENT_TRANSLATOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_EVENT_TRANSLATOR, GdkEventTranslator))
 #define GDK_IS_EVENT_TRANSLATOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_EVENT_TRANSLATOR))
 #define GDK_EVENT_TRANSLATOR_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE  ((o), GDK_TYPE_EVENT_TRANSLATOR, GdkEventTranslatorIface))
@@ -50,15 +50,15 @@ struct _GdkEventTranslatorIface
                                          GdkEventMask        event_mask);
 };
 
-GType      gdk_event_translator_get_type (void) G_GNUC_CONST;
+GType      _gdk_x11_event_translator_get_type (void) G_GNUC_CONST;
 
-GdkEvent * gdk_event_translator_translate (GdkEventTranslator *translator,
-                                           GdkDisplay         *display,
-                                           XEvent             *xevent);
-GdkEventMask gdk_event_translator_get_handled_events   (GdkEventTranslator *translator);
-void         gdk_event_translator_select_window_events (GdkEventTranslator *translator,
-                                                        Window              window,
-                                                        GdkEventMask        event_mask);
+GdkEvent * _gdk_x11_event_translator_translate (GdkEventTranslator *translator,
+                                               GdkDisplay         *display,
+                                               XEvent             *xevent);
+GdkEventMask _gdk_x11_event_translator_get_handled_events   (GdkEventTranslator *translator);
+void         _gdk_x11_event_translator_select_window_events (GdkEventTranslator *translator,
+                                                             Window              window,
+                                                             GdkEventMask        event_mask);
 
 G_END_DECLS
 

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 50302c2188f51084705072652e29ee1efab6f34d..d45f38566fb63d7442d3ff304b302cd18e8b47af 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -75,11 +75,14 @@ GList *       _gdk_screen_x11_list_visuals               (GdkScreen      *screen
 
 
 
-void _gdk_xid_table_insert (GdkDisplay *display,
-                           XID        *xid,
-                           gpointer    data);
-void _gdk_xid_table_remove (GdkDisplay *display,
-                           XID         xid);
+void     _gdk_xid_table_insert (GdkDisplay *display,
+                                XID        *xid,
+                                gpointer    data);
+void     _gdk_xid_table_remove (GdkDisplay *display,
+                                XID         xid);
+gpointer _gdk_xid_table_lookup (GdkDisplay *display,
+                                XID         xid);
+
 gint _gdk_send_xevent      (GdkDisplay *display,
                            Window      window,
                            gboolean    propagate,
@@ -106,9 +109,9 @@ void     _gdk_x11_window_translate         (GdkWindow *window,
 void     _gdk_selection_window_destroyed   (GdkWindow            *window);
 gboolean _gdk_selection_filter_clear_event (XSelectionClearEvent *event);
 
-cairo_region_t* _xwindow_get_shape              (Display *xdisplay,
-                                            Window window,
-                                            gint shape_type);
+cairo_region_t* _gdk_x11_xwindow_get_shape  (Display *xdisplay,
+                                             Window window,
+                                             gint shape_type);
 
 void     _gdk_region_get_xrectangles       (const cairo_region_t      *region,
                                             gint                  x_offset,
@@ -152,6 +155,8 @@ void _gdk_x11_display_update_grab_info_ungrab (GdkDisplay *display,
 void _gdk_x11_display_queue_events            (GdkDisplay *display);
 void _gdk_x11_device_check_extension_events   (GdkDevice  *device);
 
+GdkDeviceManager *_gdk_x11_device_manager_new (GdkDisplay *display);
+
 void _gdk_x11_display_manager_add_display     (GdkDisplayManager *manager,
                                                GdkDisplay        *display);
 void _gdk_x11_display_manager_remove_display  (GdkDisplayManager *manager,
@@ -180,13 +185,13 @@ void _gdk_x11_precache_atoms (GdkDisplay          *display,
                              const gchar * const *atom_names,
                              gint                 n_atoms);
 
-void _gdk_screen_x11_events_init   (GdkScreen *screen);
+void _gdk_events_init                 (GdkDisplay *display);
+void _gdk_events_uninit               (GdkDisplay *display);
+void _gdk_x11_dnd_init                (GdkDisplay *display);
 
-void _gdk_events_init           (GdkDisplay *display);
-void _gdk_events_uninit         (GdkDisplay *display);
-void _gdk_windowing_window_init (GdkScreen *screen);
-void _gdk_x11_visual_init       (GdkScreen *screen);
-void _gdk_x11_dnd_init          (GdkDisplay *display);
+void _gdk_x11_screen_init_root_window (GdkScreen *screen);
+void _gdk_x11_screen_init_visuals     (GdkScreen *screen);
+void _gdk_x11_screen_init_events      (GdkScreen *screen);
 
 void _gdk_x11_cursor_update_theme (GdkCursor *cursor);
 void _gdk_x11_cursor_display_finalize (GdkDisplay *display);

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 665138cd7089a9bdadeba9c8dce763deb75edb68..1cc7fc53750d8cfe1273b2a07eddf991bb21c897 100644 (file)
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -810,8 +810,8 @@ _gdk_x11_screen_new (GdkDisplay *display,
   init_multihead (screen);
   init_randr_support (screen);
   
-  _gdk_x11_visual_init (screen);
-  _gdk_windowing_window_init (screen);
+  _gdk_x11_screen_init_visuals (screen);
+  _gdk_x11_screen_init_root_window (screen);
   
   return screen;
 }
@@ -1592,7 +1592,7 @@ gdk_xsettings_notify_cb (const char       *name,
 }
 
 void
-_gdk_screen_x11_events_init (GdkScreen *screen)
+_gdk_x11_screen_init_events (GdkScreen *screen)
 {
   GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
 

diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 3a00c556c0771fcdaf3ac278b2e636d39e992e7d..2624c69448e2e1d3771699a394aba8e3ef9d4418 100644 (file)
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -101,7 +101,7 @@ gdk_visual_x11_class_init (GdkVisualX11Class *class)
 }
 
 void
-_gdk_x11_visual_init (GdkScreen *screen)
+_gdk_x11_screen_init_visuals (GdkScreen *screen)
 {
   static const gint possible_depths[8] = { 32, 30, 24, 16, 15, 8, 4, 1 };
   static const GdkVisualType possible_types[6] =

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index a3bb0f6b92a5bfba874b7e865db7752ca6d4e074..7fcc44afd3c7707fcb7d4e2195dcecb8be49b9fd 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -450,7 +450,7 @@ _gdk_x11_window_tmp_reset_parent_bg (GdkWindow *window)
 }
 
 void
-_gdk_windowing_window_init (GdkScreen * screen)
+_gdk_x11_screen_init_root_window (GdkScreen *screen)
 {
   GdkWindow *window;
   GdkWindowImplX11 *impl;
@@ -882,7 +882,7 @@ gdk_x11_window_foreign_new_for_display (GdkDisplay *display,
 
   display_x11 = GDK_DISPLAY_X11 (display);
 
-  if ((win = gdk_xid_table_lookup_for_display (display, window)) != NULL)
+  if ((win = _gdk_xid_table_lookup (display, window)) != NULL)
     return g_object_ref (win);
 
   gdk_x11_display_error_trap_push (display);
@@ -912,7 +912,7 @@ gdk_x11_window_foreign_new_for_display (GdkDisplay *display,
   impl = GDK_WINDOW_IMPL_X11 (win->impl);
   impl->wrapper = win;
 
-  win->parent = gdk_xid_table_lookup_for_display (display, parent);
+  win->parent = _gdk_xid_table_lookup (display, parent);
 
   if (!win->parent || GDK_WINDOW_TYPE (win->parent) == GDK_WINDOW_FOREIGN)
     win->parent = gdk_screen_get_root_window (screen);
@@ -963,7 +963,7 @@ GdkWindow *
 gdk_x11_window_lookup_for_display (GdkDisplay *display,
                                    Window      window)
 {
-  return (GdkWindow*) gdk_xid_table_lookup_for_display (display, window);
+  return (GdkWindow*) _gdk_xid_table_lookup (display, window);
 }
 
 static void
@@ -3737,9 +3737,9 @@ gdk_x11_window_set_functions (GdkWindow    *window,
 }
 
 cairo_region_t *
-_xwindow_get_shape (Display *xdisplay,
-                   Window window,
-                   gint shape_type)
+_gdk_x11_xwindow_get_shape (Display *xdisplay,
+                            Window   window,
+                            gint     shape_type)
 {
   cairo_region_t *shape;
   GdkRectangle *rl;
@@ -3787,8 +3787,9 @@ gdk_x11_window_get_shape (GdkWindow *window)
 {
   if (!GDK_WINDOW_DESTROYED (window) &&
       gdk_display_supports_shapes (GDK_WINDOW_DISPLAY (window)))
-    return _xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
-                             GDK_WINDOW_XID (window), ShapeBounding);
+    return _gdk_x11_xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
+                                       GDK_WINDOW_XID (window),
+                                       ShapeBounding);
 
   return NULL;
 }
@@ -3799,9 +3800,9 @@ gdk_x11_window_get_input_shape (GdkWindow *window)
 #if defined(ShapeInput)
   if (!GDK_WINDOW_DESTROYED (window) &&
       gdk_display_supports_shapes (GDK_WINDOW_DISPLAY (window)))
-    return _xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
-                             GDK_WINDOW_XID (window),
-                             ShapeInput);
+    return _gdk_x11_xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
+                                       GDK_WINDOW_XID (window),
+                                       ShapeInput);
 #endif
 
   return NULL;

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 15b5e50d1e112da1fbf4cebf3fcfc60029b081b2..e3e8bca51bf4cef4e6628d74929b6cb66e60d315 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -185,9 +185,6 @@ GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
 GdkVisual* gdkx_visual_get            (VisualID   xvisualid);
 #endif
 
-     /* Return the Gdk* for a particular XID */
-gpointer      gdk_xid_table_lookup_for_display (GdkDisplay *display,
-                                               XID         xid);
 guint32       gdk_x11_get_server_time  (GdkWindow       *window);
 guint32       gdk_x11_display_get_user_time (GdkDisplay *display);
 
@@ -211,7 +208,6 @@ XID      gdk_x11_screen_get_monitor_output   (GdkScreen *screen,
                                               gint       monitor_num);
 
 #ifndef GDK_MULTIHEAD_SAFE
-gpointer      gdk_xid_table_lookup   (XID              xid);
 gboolean      gdk_net_wm_supports    (GdkAtom    property);
 void          gdk_x11_grab_server    (void);
 void          gdk_x11_ungrab_server  (void);

diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 52b86c9e64fa90628d08b6f5138e610434e2e8c7..ddd49b5f890f1395af085f10d18ee9c8588b775e 100644 (file)
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -32,15 +32,22 @@
 
 #include <stdio.h>
 
-static guint     gdk_xid_hash  (XID *xid);
-static gboolean  gdk_xid_equal (XID *a,
-                               XID *b);
+static guint
+gdk_xid_hash (XID *xid)
+{
+  return *xid;
+}
 
+static gboolean
+gdk_xid_equal (XID *a, XID *b)
+{
+  return (*a == *b);
+}
 
 void
 _gdk_xid_table_insert (GdkDisplay *display,
-                      XID        *xid,
-                      gpointer    data)
+                       XID        *xid,
+                       gpointer    data)
 {
   GdkDisplayX11 *display_x11;
 
@@ -51,7 +58,7 @@ _gdk_xid_table_insert (GdkDisplay *display,
 
   if (!display_x11->xid_ht)
     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
-                                           (GEqualFunc) gdk_xid_equal);
+                                            (GEqualFunc) gdk_xid_equal);
 
   if (g_hash_table_lookup (display_x11->xid_ht, xid))
     g_warning ("XID collision, trouble ahead");
@@ -61,7 +68,7 @@ _gdk_xid_table_insert (GdkDisplay *display,
 
 void
 _gdk_xid_table_remove (GdkDisplay *display,
-                      XID         xid)
+                       XID         xid)
 {
   GdkDisplayX11 *display_x11;
 
@@ -73,61 +80,19 @@ _gdk_xid_table_remove (GdkDisplay *display,
     g_hash_table_remove (display_x11->xid_ht, &xid);
 }
 
-/**
- * gdk_xid_table_lookup_for_display:
- * @display: the #GdkDisplay.
- * @xid: an X id.
- *
- * Returns the GDK object associated with the given X id.
- *
- * Return value: (transfer none): the associated #GdkWindow, or %NULL
- *     of no object is associated with the X id.
- *
- * Since: 2.2
- */
 gpointer
-gdk_xid_table_lookup_for_display (GdkDisplay  *display,
-                                 XID          xid)
+_gdk_xid_table_lookup (GdkDisplay  *display,
+                      XID          xid)
 {
   GdkDisplayX11 *display_x11;
   gpointer data = NULL;
-  
+
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  
+
   display_x11 = GDK_DISPLAY_X11 (display);
 
   if (display_x11->xid_ht)
     data = g_hash_table_lookup (display_x11->xid_ht, &xid);
-  
-  return data;
-}
-
 
-/**
- * gdk_xid_table_lookup:
- * @xid: an X id.
- *
- * Returns the Gdk object associated with the given X id for the default
- * display.
- *
- * Return value: (transfer none): the associated #GdkWindow, or %NULL
- *     if no object is associated with the X id.
- */
-gpointer
-gdk_xid_table_lookup (XID xid)
-{
-  return gdk_xid_table_lookup_for_display (gdk_display_get_default (), xid);
-}
-
-static guint
-gdk_xid_hash (XID *xid)
-{
-  return *xid;
-}
-
-static gboolean
-gdk_xid_equal (XID *a,
-              XID *b)
-{
-  return (*a == *b);
+  return data;
 }

diff --git a/gdk/x11/xsettings-common.h b/gdk/x11/xsettings-common.h
index de7367a6c2f6c405e44599ef0b0bf24f0ba1923d..dcd87f4fa438da305cdb8b4d9ae5001c6dfc77cb 100644 (file)
--- a/gdk/x11/xsettings-common.h
+++ b/gdk/x11/xsettings-common.h
@@ -31,22 +31,22 @@ extern "C" {
 
 /* Renames for GDK inclusion */
 
-#define xsettings_byte_order             _gdk_xsettings_byte_order
-#define xsettings_client_destroy         _gdk_xsettings_client_destroy
-#define xsettings_client_get_setting     _gdk_xsettings_client_get_setting
-#define xsettings_client_new             _gdk_xsettings_client_new
-#define xsettings_client_new_with_grab_funcs _gdk_xsettings_client_new_with_grab_funcs
-#define xsettings_client_set_grab_func   _gdk_xsettings_client_set_grab_func
-#define xsettings_client_set_ungrab_func _gdk_xsettings_client_set_ungrab_func
-#define xsettings_client_process_event   _gdk_xsettings_client_process_event
-#define xsettings_list_copy              _gdk_xsettings_list_copy
-#define xsettings_list_delete            _gdk_xsettings_list_delete
-#define xsettings_list_free              _gdk_xsettings_list_free
-#define xsettings_list_insert            _gdk_xsettings_list_insert
-#define xsettings_list_lookup            _gdk_xsettings_list_lookup
-#define xsettings_setting_copy           _gdk_xsettings_setting_copy
-#define xsettings_setting_equal          _gdk_xsettings_setting_equal
-#define xsettings_setting_free           _gdk_xsettings_setting_free
+#define xsettings_byte_order             _gdk_x11_xsettings_byte_order
+#define xsettings_client_destroy         _gdk_x11_xsettings_client_destroy
+#define xsettings_client_get_setting     _gdk_x11_xsettings_client_get_setting
+#define xsettings_client_new             _gdk_x11_xsettings_client_new
+#define xsettings_client_new_with_grab_funcs _gdk_x11_xsettings_client_new_with_grab_funcs
+#define xsettings_client_set_grab_func   _gdk_x11_xsettings_client_set_grab_func
+#define xsettings_client_set_ungrab_func _gdk_x11_xsettings_client_set_ungrab_func
+#define xsettings_client_process_event   _gdk_x11_xsettings_client_process_event
+#define xsettings_list_copy              _gdk_x11_xsettings_list_copy
+#define xsettings_list_delete            _gdk_x11_xsettings_list_delete
+#define xsettings_list_free              _gdk_x11_xsettings_list_free
+#define xsettings_list_insert            _gdk_x11_xsettings_list_insert
+#define xsettings_list_lookup            _gdk_x11_xsettings_list_lookup
+#define xsettings_setting_copy           _gdk_x11_xsettings_setting_copy
+#define xsettings_setting_equal          _gdk_x11_xsettings_setting_equal
+#define xsettings_setting_free           _gdk_x11_xsettings_setting_free
 
 
 typedef struct _XSettingsBuffer  XSettingsBuffer;